I have a situation where I will have to rebase a topic branch to a master. That's fine, it's the normal rebase case and works great. The complication is when I'm trying to get this process to be in sync on a bare remote repository. e.g. o--o--o origin/master \ o--o origin/topic o--o--o clone/master - tracking origin/m...
I have to rewrite the history of my repository because it contains some credentials. As I have to amend the root commit I followed the instructions from Git Faq. My problem is though that I have two branches and several tags already in the repository and I'd like that my history rewrite to apply to those too. The repo isn't public yet, s...
We use branches to do our work and keep trunk pristine for the most part. Before merging my changes from my branch into trunk, I want to make sure that I've got the latest changes from svn/trunk into my local branch. It's taken me a bit to figure it out but here's the workflow I've come up with, and I'd like to know if there's a better w...
On Windows, rebase changes the preferred load location for a dll and (I've read) can dramatically decrease application load time. Is there a similar concept on Linux and/or gcc? ...
I have to deal with Subversion 1.4 merges at the moment and have found this answer to a question, which exactly describes my problem. The actual question deals with git-style rebase and merge problems with SVN which produce tree conflicts. It includes the following recommendation: [...] instead of range-merging the branch to a workin...
I have started using Git in the middle of my project, where the first two commits are just some initial settings (.gitignore and .gitattributes), and the third commit M2 adds the content of the SVN trunk: I1 -- I2 -- M2 -- N -- .. -- Z I have imported the SVN history in a branch named svn, where M1 is the SVN trunk (with the same cont...
Disclaimer: Things would be simpler had I known about git-svn at the start. I had a large codebase in SVN, and crudely got it situated in git. Work life was very painful without fast, efficient branching, so this was all accomplished in a bit of a rush. My process was: svn export git init . git add . git commit -a -m "initial commit"...
We currently have 2 branches: /repo/branch/current_version /repo/branch/next_version current_version is a branch where all developers currently works. We starting a next version and created next_version branch from some point in current_version, while work on current_version is still continuing. In next_version we do some development...
I use a lot of local topic branches in git, and sometimes end up with dependencies between topic branches causing rebase problems. For example, with a structure like: master ---> featureA ---> featureB \--> featureC If master changes and I get (and resolve) conflicts when rebasing featureA, then afterwards rebasin...
I'm using git rebase -p -i SHA1^ And moving a single commit backwards in time to just after SHA1. The commit consists of a WAV file, so there's no way this is breaking my code. Seemingly unrelated files pop up in conflicts later in history. Why am I getting these conflicts during the rebase in this scenario? Isn't -p enough to keep...
How do you squash your entire repository down to the first commit? I can rebase to the first commit, but that would leave me with 2 commits. Is there a way to reference the commit before the first one? ...
Hi, I wanted to have a simple solution to squash two merge commits together during an interactive rebase. My repository looks like: X --- Y --------- M1 -------- M2 (my-feature) / / / / / / a --- b --- c --- d --- e --- f (stable) That is, I have a my-feature branch that has ...
Hi, I was trying to edit an old commit message as explained here. The thing is that now, when I try to run rebase -i HEAD~5 it says interactive rebase already started. So then I try: git rebase --continue but got this error: error: Ref refs/heads/master is at 7c1645b447a8ea86ee143dd08400710c419b945b but expected c7577b53d05c91026b99...
After quite a few hours playing with rebase, the repo still looks different from what I need: I would like to accomplish the following tasks [some of which were OK before I started messing with rebase :( ] Move The top commit ("Removed extraneous...") to before the branch off (Right above "fix for #226"). Combine the two commits that...
i want to push the code to origin server after rebasing op applied. conflict is reported every time. ...
We have project (PHP application), but instalation for each client vary, sometimes very little, sometimes more. Still, big part of source code is common. We manage specific installations as parallel branches to master branch and we need to transfer changes from master to other branches. Same situation was solved in Git: how maintain (mos...
Hi, I want to move a changeset from one branch to another. Basically, I currently have: A -> B -> C -> D # default branch And I want: A # default branch \-> B -> C -> D # some_new_branch Where some_new_branch does not exist yet. I am used to git, so I guess there is a simple "mercurial" way I am missing. ...
I have this (git repo): A--B--C--D ->master \--E ->dev And I want to bring only commit D to branch dev (D doesn't depend on C), so that: A--B--C--D ->master \--E--D' ->dev But D' shouldn't get added to master after a merge: A--B--C--D--E' ->master \--E--D'/ ->dev This is because I want to bring only a file update ...
I have a problem with a SVN branch. I made a checkout of it with git checkout -t -b stable svn/stable. Then I did a merge with git rebase master. After that I tried to commit the merge changes into the remote branch with git svn dcommit But now it seems, that Git pushed the changes into the trunk instead of the branch :( And git status...
Since asking my last question which turned out to be about rebasing with GIT, I have decided that I don't want to rebase at all. Instead I want to: Branch Work work work, checking in and pushing at all times Throw out all of those commits and pretend they never happened (so one clean commit at the end of work) I do this currently by ...