My current git tree looks like this: / C -> D -> more commits previous commits -> A -> B \ C -> E -> more commits where B and C are exactly the same (in terms of file changes) but they are different commits. My question is can I make my tree look like […]
So here is the deal, I’m using git and Bitbucket for my application. I’m using git-flow system for git. So the background is this. I had a release branch called release/v1.0.2 which had been open for a while (my users are currently beta-testing 1.0.2). Meanwhile beta-testing 1.0.2 I have started implementing on two new features, […]
My repository has only one branch HEAD. My local branch is master and I’m usually checked out on my local branch. Now when I pull it won’t update my local master. I have to right click on master -> merge, then select remote branches -> HEAD and then updates will be on master too. I […]
We have a master branch and multiple feature branches. And found one feature branch is missing now. How can I find who deleted a feature branch from our team project at GitHub?
I have a repository with structure like this: /MyProject /Module1 /Module2 /Experimental /Module1 /Module2 In which, Experimental is contain the experimental code; I know this is not the best practice for Git, but people did it in the past. Now, we need to make Experimental become a branch for MyProject. I used git subtree split […]
I have two branches in a git repository, it’s a large project, lots of files and lots of folders, however theres only probably a couple of hundred files that are different, but I’d like everything different to be outputted into a text file. I’m not very good with git but when I run the command […]
I’m going to work on a project with a teammate, so we decided to set up a Git server. We followed this tutorial : http://git-scm.com/book/en/Git-on-the-Server-Gitosis We created a gitrepo/ directory locally on my computer, and did a git init inside it. Then, we created a index.html file, git add index.html and git commit -m “First […]
Currently I’m working on the master and made some changes. Instead of just push my current working I wanted to push all the things to a branch (Cause several people are working on the same thing, don’t want to make a fuss). So following is what I did: git branch <branch_name> git push origin <branch_name> […]
I have a master and want to have several “outputs” How do I accomplish this. I’ve no clue if this is possible with Git. Please have a look at this example git project: Master phpfiles.php config.php plugins a.php b.php c.php Branch A phpfiles.php config.php -> is different then the Master plugins a.php Branch B subfolder1 […]
Would it be possible to compare Branch 1 and Branch 2 changes against Master in this scenario? * * Branch 2 | / |/ | * Branch 1 |/ * Master Ideally this is something difftool would be able do.