Tag: merge

Strange merge/rebase result in GIT

guys! I migrated our project from Mercurial to GIT recently, all things works well and we like it more than Mercurial. There is only one thing that confused us. scenery 1: Sometims, one of our programmers may change his system date because of self-testing. It’s a big he forgot to change the system date back […]

How to manage eclipse git authority?

I am working on a java web application project with Eclipse. My team uses Git(which is basically included in Eclipse Luna) as a code merging tool. What I want to do is separate authority by users. like github.com. (As you know, people commit their soucecode in local repository and request ‘pull request’ to Super user. […]

Old git-commits move to new branch

I have the following problem: – I have Master branch and a Dev branch and I recently added another one called TA-17. – I submitted all my commits to this branch merged it with Dev, and closed TA-17 branch. – Then I commited twice something to Dev branch – Now I created a new branch […]

Git Workflow, reverting merge and reaplying it in future

Here is a workflow we use in our company: Master is a branch which should alway stable and is used to build production. When we develop new feature we create a feature branch from master. We have many teams working on many features at same time. When a feature is ready, Master is merged into […]

git rebase after merging published branch?

I want to use rebase to remove meaningless merge-commits. At the same time, I want to preserve the branch history when I branched off to develop some feature. Basically, git rebase when pull from remote develop branch into my local develop branch. (by using git config branch.develop.rebase true) git merge when merging in feature branch […]

Git cherry-pick old commit

I just encountered the following scenario: Some commits in a branch [develop] (multiple people working on it) were causing issues and I wanted to copy them to a separate branch [feature1] so they could be fixed/added to (and the code removed from the current branch [develop]). They had already been pushed to remote [origin/develop] quite […]

Overwrite local changes from remote repository

I have two remote repositories. The first one (Framework) get’s pulled into the second one (MySite). I make some changes to MySite, like CSS for example, and push it all to the MySite repo. Now, if I (or another dev) change a PHP file, User.php for example (which is stored on the Framework repo), on […]

Remove “obsolte” merge commits

This is probably a relatively easy question to answer but I don’t seem to be able to come up with the solution myself (or find it on the net). So I’m counting on you!! 🙂 Short: In a history where I’ve merged a feature branch into master several times over the course of time, I’d […]

Git mergetool with Perforce

I am using Perforce to resolve file conflicts in Git. To set this up, I ran git config –global mergetool.p4merge.cmd ‘p4merge.exe \”$BASE\” \”$LOCAL\” \”$REMOTE\” \”$MERGED\”‘ git config –global merge.tool p4merge p4merge is available in the path. When I run git mergetool after conflicts have arisen, p4merge issues the following error message: Errors: “./myfile.BASE.7132.example” is an […]

How can I find merges with unexpected conflicts in git?

In the following example, I produce a merge at the head of master which is “strange” — it changes a file under which there was no conflict. Git doesn’t seem to like telling me that I’ve done so. git init test cd test seq 1 5 > file1 git add file1 seq 6 10 > […]

Git Baby is a git and github fan, let's start git clone.