top button
Flag Notify
    Connect to us
      Site Registration

Site Registration

GIT: What is octopus merge and how it is different from other merge techniques ?

+1 vote
385 views
GIT: What is octopus merge and how it is different from other merge techniques ?
posted Feb 27, 2016 by Vikram Singh

Looking for an answer?  Promote on:
Facebook Share Button Twitter Share Button LinkedIn Share Button

Similar Questions
+1 vote
Not able to create Github account password

I was learning to user git-bash and github. As part of tutorial we were asked to set username & password through git-bash command line and create an account in github. But since I already set the email through gitbash global config, I am not allowed to create account or create a password for my account .

Please let me know how can I create a account in github or delete the entry to start fresh.

+3 votes
Best practice setup for github projects on server

I was hoping that somebody could give me advice since I'm new to git.

I'll be installing a couple of projects from github on our servers, and adding some features.

Should I create a repository on our server (e.g. in /opt/git/), add the github project as a remote, and create a branch? Then on my local machine add our server as the remote and then pull / push with that?

On the server there will be two web directories: stable and dev. I was planning for these to be branches, and then just pull from the server repository using the local protocol.

I think it would mean sorting out merge actions on the server. I'm hoping to be able to fetch and integrate updates from the developer's github repository, but without making things more complicated than they need to be.

Does anyone have any suggestions?

...