version control - Is git rebase recommended while multiple developers working on same branch? -



version control - Is git rebase recommended while multiple developers working on same branch? -

in http://git-scm.com/book/en/git-branching-rebasing#the-perils-of-rebasing

it recommened rebasing should not done when repository public.

and recent post in git merge vs rebasing

recommends rebase should not done on branch shared between developers.

i understand that, because developer might first merge code , decides rebase code, other developers might endup in creating multiple duplicate commits explained in perils of rebasing.

what if developers comes on mutual understanding going rebase code instead of merging? recommendation still apply?

p.s

all these answers confuse me. thick reframe question again.

lets assume there 2 developer working on 2 different computers. there central repository. 2 developers cloned , started working.

developer 1:

created branch local/master. lets local/iss123. pushed remote

developer 2:

pulled changes remote checksout local/iss123 made commits in local/iss123 pushed changes remote/iss123

developer 1:

has local commits he wants rebase branch origin/iss123 git rebase origin/iss123 then pushes commits origin/iss123

developer 2:

has local commits he rebase branch origin/iss123 git rebase origin/iss123

and on. developer 1 & 2 rebase branch origin/branch pushes changes origin/branch

after functionality stable,

developer 1:

checkouts local/master pulls latest code origin/master checks whether there commits in local/master other developers will checkout local/iss123 will rebase local/iss123 local/master if there new commits. then pushes branch local/iss123 remote/iss123 if there rebase done. then checksout local/master merges local/iss123 local/master then pushes local/master origin/master

developer 2:

will pull latest changes origin/master , origin/iss123 local/master , local/iss123 respectively

later cycle continues again.

is correct? right way when 2 developers working on same branch , want rebase instead of merging?

once code force public repository, no alter should happen commits. when rebasing on local repository pushing find. example: create changes on feature branch. pull parent branch of feature branch, develop branch. can rebase feature branch on develop. can force develop branch origin.

so if developers rebasing on local repos rebase force ok.

the main point 1 time commit or branch has been shared on public repo, no 1 can alter rebase or amend comment, etc.

git version-control

Comments

Post a Comment

Popular posts from this blog

php - Android app custom user registration and login with cookie using facebook sdk -

php - Android app custom user registration and login with cookie using facebook sdk - i developing android application in users need register , log in using facebook. approximately, flow. open app first time, authenticate facebook, data, send info server create them business relationship in application, start session new business relationship in server, cookie perform later interactions. so far good. what need know wich info have send server, can able identify users when log in seccond time. because need start session in server , send cookie android app farther interactions. i'm using php server side language. i thinking getting getaccesstoken() in android facebook sdk, pass server on business relationship creation , storing in android app. but can't manage how login users on sec time utilize app. any suggestions ? in advance ! to uniquely identify user within app, should create request /me , user's id. guaranteed unique , remain con...
Read more

c# - Create a Notification Object (Email or Page) At Run Time -- Dependency Injection or Factory -

c# - Create a Notification Object (Email or Page) At Run Time -- Dependency Injection or Factory - i have code emails me notification when happens. trying add together page , also remove dependency on email. for reference; have name of notification want send stored string in database. @ runtime have list of people , string representation of want receive. i thought dependency injection ninject, kernel bindings got big , seemed hacking together. then thought simple factory, activator.createinstance(email/page) inotifcation, don't know how handle differing constructor parameters (unless utilize common, complex property, employee, has info need). so far have this: public interface inotification { void sendmessage(); } public class email: inotification { private readonly string _toemailaddress; private string body { { homecoming "email"; } } private static string smtphost { ...
Read more

Set Up Of Common Name Of SSL Certificate To Protect Plesk Panel -

Set Up Of Common Name Of SSL Certificate To Protect Plesk Panel - a pci compliance scanner balking self signed ssl certificate protecting secure access plesk panel contains name mismatch between location of plesk panel , name on certificate, namely self-signed cert's name "parallels" , domain reach plesk 'ip address:8443'. so figured go ahead , free ssl certificate seek fiddle error. when generated certificate used server domain name site name when generated certificate. if visit 'domain name:8443' fine, no ssl warning. if visit 'ip address:8443' (which believe scanner does) certificate name mismatch error, digicert's ssl checker says certificate name should ip address. can generate certificate mutual name ip address? tempted should pci scanner accepts, right mutual name use? run issue before? you can seek subject alternative name extension ip address. also, can maintain "parallels" mutual name, , add together ...
Read more