Categories
Git Programming Languages

How to Resolve Conflicts in Files and Push the code to Git

If you are facing some conflict issues in some file(s) during commit or merge then you can follow the below procedure to resolve conflicts. You don’t need mergetool for this. It can be resolved pretty easily manually. WinMerge is pretty good tool to resolve these kinds of conflict issues.

1. First see and identify which files are in conflict by using git status command.
2. Open each file in text editor and examine the difference and resolve them by removing the code that you don’t need. You may need to discuss it with fellow developers/designers who committed the code.
3. Once you’ve resolved the conflict in a file then use git add file_name_with_complete_path.
4. Once you’ve resolved all conflicts then use the command git commit -a -m “resolved conflict in files”
5. Now use the command git push origin YourBranchName to push your changes to Git repository.

Categories
Git Linux Server PHP

Basic Git commands and use of these commands

Once you have installed git on your local computer then you have to go to the folder where git is installed.
To go to the folder you can write the following
pwd
cd c:/xampp/htdocs/
git branch

If you are using Git Public Repository then you must be aware about the following basic commands of Git.
Here is a small list of basic Git commands.

git push origin :BN – remove/delete branch from git server/repository

git stash – if there are conflicts and you want to avoid those conflicts

(git add filename) in which u resolved conflict then (git commit -a -m “resolved conflict while making design changes by nilesh”) then git push origin Dev and see your changes

git merge commit_id (to commit the changes in the branch that you are in now)

git reset – -hard (Reset current HEAD to the specified state)

git reset – -hard origin/master (if you are in master branch and git pull showing some conflicts then you can use this command to reset the master)

git branch -D BN – to delete a branch (you must be in other branch(i.e master or IndexFlowVaseem) to delete this branch)

git fetch origin BN:BN – to pull branch data from git

pwd – to see current working directory

git branch MyNewBranch – to create a new branch

git checkout master – to work in master branch or to switch master branch

git pull origin branchname – to get the github.com data on your local computer or git pull origin Dev

git pull origin Dev – a new branch named as Dev will be created with the code from git

git status – to see the changes in your branch and in github.com branch

git commit filepath_name1 filepath_name2 -m “your comment” – to commit the changes you have made

git push origin MyBranch – to upload your data to git branch

git add filename1 filename2 – to add new files in git

git log – to see the commit in the current branch

rm filename1 filename2 – to delete files

The most commonly used git commands are:
add–Add file contents to the index
bisect–Find by binary search the change that introduced a bug
branch–List, create, or delete branches
checkout–Checkout a branch or paths to the working tree
clone–Clone a repository into a new directory
commit–Record changes to the repository
diff–Show changes between commits, commit and working tree, etc
grep–Print lines matching a pattern
init–Create an empty git repository or reinitialize an existing one
log–Show commit logs
merge–Join two or more development histories together
mv–Move or rename a file, a directory, or a symlink
pull–Fetch from and merge with another repository or a local branch
push–Update remote refs along with associated objects
rebase–Forward-port local commits to the updated upstream head
rm–Remove files from the working tree and from the index
show–Show various types of objects
tag–Create, list, delete or verify a tag object signed with GPG

Categories
Git Programming Languages

How to get Git Commit Id

If you are a programmer or developer then you must heard about the Git.
Git is a free & open source, distributed version control system designed to handle everything from small to very large projects with speed and efficiency.

You must If you are working with Git and you want to make changes in the code. Then after making those changes you will need a commit id to make those changes Live.

Please follow the following procedure to get a Git commit id.

cd /c/xampp/xampp/htdocs/lazy-load-release/
git checkout master    (to go to master branch)
git pull origin master (this will copy all the data from git to your computer)
git branch NewBranch (this will create a new branch with data of master branch)
git checkout NewBranch (To switch to your branch and then Put your files or work in lazy-load-release(name of folder may be differ) folder)
git status (you will see the list fo files that just been changed)
git commit filename1 filename1 -m “author_commit”
git push origin NewBranch (if you are in the same branch NewBranch) or git push origin NewBranch:NewBranch (if you are not in the same branch)
git log (copy the commit id)