git - What are the pitfalls of "always" rebasing? -

-

a few people @ work swear git pull --rebase. in fact, won't git pull without it, when several people working on shared branch.

it understanding rewrites history. in fact, have seen said 1 should never rebase on public/shared branch.

my question:

  • what concrete example of way rebasing "rewrites history"?
  • what concrete examples of bad things occur if violate "golden rule of rebasing"?

possible difference suggested dupe:

i'm not talking rebasing master feature branch. talking several developers working on same feature branch, doing git pull --rebase, making changes, pushing (doing pull --rebase if push rejected), etc.

we use in our workflows.

if use on short-lived branches it's relatively safe. you're replaying your local commits (rewriting that history) on top of pushed commits of coworkers.

if you're rebasing entire collaboration branch in best interests coordinate coworkers. otherwise it's easy lose work. pull -r, it's pretty hard.


Comments

Post a Comment

Popular posts from this blog

Django REST Framework perform_create: You cannot call `.save()` after accessing `serializer.data` -

-
i have following viewset: class artistprofileviewset(viewsets.modelviewset): queryset = artistprofile.objects.all() serializer_class = artistprofileserializer def perform_create(self, serializer): if serializer.is_valid(): serializer.save() with following serializers: class simpleartisttrackserializer(serializers.hyperlinkedmodelserializer): class meta: model = artisttrack fields = (...my fields...) class artistprofileserializer(serializers.hyperlinkedmodelserializer): owners = userserializer(many=true, required=false) tracks = simpleartisttrackserializer(many=true, required=false) class meta: model = artistprofile fields = (...my fields...) i getting following error: assertionerror: cannot call `.save()` after accessing `serializer.data`.if need access data before committing database inspect 'serializer.validated_data' instead. i don't see editing serializer.data object. th...
Read more

Why does Go error when trying to marshal this JSON? -

-
i'm trying rather simple example of trying decode json file structs using golang. however, when attempting error that json: cannot unmarshal object go value of type []main.track which don't understand. here's code in question, , json can found here . package main import ( "encoding/json" "fmt" "net/http" "os" ) // tracks group of track types type tracks struct { tracks []track } // track represents singular track type track struct { name string url string artist artist } // artist represents single artist type artist struct { name string mbid string url string } func main() { url := "http://ws.audioscrobbler.com/2.0/?method=geo.gettoptracks&api_key=c1572082105bd40d247836b5c1819623&format=json&country=netherlands" response, err := http.get(url) if err != nil { fmt.printf("%s\n", err) os.exit(1) } de...
Read more