Apparently the files were added in remote repository, no matter what was the content of .gitignore file in the origin. As the files exist in the remote repository, git has to pull them to your local work tree as well and therefore complains that the files already exist. .gitignore is used only for scanning for the newly added … Read more
As noted previously, pass in the –no-commit flag, but to avoid a fast-forward commit, also pass in –no-ff, like so: To examine the staged changes: And you can undo the merge, even if it is a fast-forward merge:
Looks like you have an open git commit or git merge going on, and an editor is still open editing the commit message. Two choices: Find the session and finish it (preferable). Delete the .swp file (if you’re sure the other git session has gone away). Clarification from comments: The session is the editing session. You can see what .swp is being used by entering … Read more
Or, simply, for the default repository: If you’re already in conflicted state…
yes just do to keep mobiledevicesupport in sync with master then when you’re ready to put mobiledevicesupport into master, first merge in master like above, then … and thats it. the assumption here is that mobilexxx is a topic branch with work that isn’t ready to go into your main branch yet. So only merge … Read more
All you should need to do is:
You can fetch and then check out only one file in this way: Regarding the git checkout command: <revision> — a branch name, i.e. origin/master <yourfilepath> does not include the repository name (that you can get from clicking copy path button on a file page on GitHub), i.e. README.md
From SourceTree, click on Tools->Options. Then on the “General” tab, make sure to check the box to allow SourceTree to modify your Git config files. Then switch to the “Diff” tab. On the lower half, use the drop down to select the external program you want to use to do the diffs and merging. I’ve … Read more
Check out the aq branch, and rebase from master.
A similar alternative is the –strategy-option (short form -X) option, which accepts theirs. For example: However, this is more equivalent to -X ours than -s ours. The key difference being that -X performs a regular recursive merge, resolving any conflicts using the chosen side, whereas -s ours changes the merge to just completely ignore the other side. In some cases, the main problem using -X theirs instead of … Read more