Conflicts are going to happen if both branches have changes to the files. This is a good thing. Keeping your branches up-to-date with each other will prevent some of them . However over all, conflicts are not bad. The rebase option can also prevent many of them from happening. git merge branch_1 If you are …
What happen to tag t? Let’s say you created branch x from a commit E and then tagged that commit with tag t. E.g. x (branch) | V A—–B——C——D——E ^ | t (tag) If you remove branch x nothing happens to tag t. git branch -D x The tag still points to commit E. A—–B——C——D——E …
Add their github fork repo as a remote to a clone of your own repo: git remote add other-guys-repo <url to other guys repo> Get their changes: git fetch other-guys-repo Checkout the branch where you want to merge: git checkout my_new_branch Merge their changes in (assuming they did their work on the master branch): git …
It looks like github has a simple UI for creating branches. I opened the branch drop-down and it prompts me to “Find or create a branch …”. Type the name of your new branch, then click the “create” button that appears. To retrieve your new branch from github, use the standard git fetch command. I’m …
The branch being pushed to is the first parameter to the update hook. If you want to lock the branch myfeature for pushing, this code (placed in hooks/update) will do it: #!/bin/sh # lock the myfeature branch for pushing refname=”$1″ if [[ $refname == “refs/heads/myfeature” ]] then echo “XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX” echo “You cannot push to myfeature! …
I don’t know how to do that in the commit message. But after the merge, this will give the names of all the files affected by the merge commit: git log -m –name-only For only a list of filenames of the commit: git log -m -1 –name-only –pretty=”format:” <Merge SHA> There is some white space …
git fetch origin; git reset –hard origin/<branch>
That’s actually called “delete old master branch and create new from scratch” This will create a new master branch pointing to initial commit: git branch -D master git checkout -b master <initial commit hash> This will create a totally new master branch unrelated to whatever you had: git branch -D master git checkout –orphan master …
This is how I remove local branches that are not longer relevant: git branch –merged origin/master | xargs git branch -d You may need to tweak it according to your specific configuration (e.g. see comments below to exclude particular branches), but the first command here before the pipe should give you a list of all …
git branch tmp # mark the current commit with a tmp branch git reset –hard Commit1 # revert to Commit1 The SO answer “What’s the difference between ‘git reset’ and ‘git checkout’ in git?” is quite instructive for that kind of operation A git reset –hard HEAD~2 would do the same thing (without needing to …