When using GitHub, you could do this using a Pull Request. Simply push your development branch to the forked remote repository and create the pull request as described in the linked article. The owner of the original repository can then add your repository as a new remote repository, fetch your changes and merge your development … Read more
The answer is yes for default merges. A three-way merge finds a common ancestor and then applies the differences from both sides, an operation that isn’t order dependent. The topic of merge-ordering and commutativity generated a fascinating discussion on the git list (if you’re into that kind of thing, that is). Note B into C … Read more
I was able to squash several commits after multiple merges from the master branch using the strategy found here: https://stackoverflow.com/a/17141512/1388104 git checkout my-branch # The branch you want to squash git branch -m my-branch-old # Change the name to something old git checkout master # Checkout the master branch git checkout -b my-branch # Create … Read more
There are three simple solutions to copy the last version that is in you remote repository, discarding all changes that you have made locally: Discard your repository and clone again. This is the most simple solution, but if your repository is big, it can take a long time, and may require extra effort like reconfigureing, … Read more
tl;dr Run git add first. I just discovered that if your uncommitted changes are added to the index (i.e. “staged”, using git add …), then git stash apply (and, presumably, git stash pop) will actually do a proper merge. If there are no conflicts, you’re golden. If not, resolve them as usual with git mergetool, … Read more
git checkout -m <filename> This will remove it from the index, and revert back to a “conflicted” file that has all of the markers required to then do a merge. From the git help checkout man page: -m, –merge When switching branches, if you have local modifications to one or more files that are different … Read more
Add –preserve-merges to your rebase command. In case there were conflict resolutions in your merge, add ‘recursive theirs’ strategy as a parameter as well. EDIT: –preserve-merges is now deprecated, use –rebase-merges instead
“git merge –squash” (after “git fetch”; “git pull” is just fetch+merge, pehaps it also allows –squash option) might be what you want. From git-merge(1): –squash Produce the working tree and index state as if a real merge happened, but do not actually make a commit or move the HEAD, nor record $GIT_DIR/MERGE_HEAD to cause the … Read more
The “master” in your case appears to be “fast-forwardable”. You could “push” the branch to master. cd /path_to_dir_with_no_branch_switch/ git push . appbranch:master
You can set a different branch to push to a different server for individual branches by using these commands: As of Git 1.8.0: git branch –set-upstream-to origin/foo foo Note: If the last foo is left out, it will choose the current branch. As of Git 1.7.0: git branch –set-upstream foo origin/foo In your case, you … Read more