Git Pull opens VIM even with --no-edit -

-

the "vim opens asking commit message after implicit non-conflicting merge" seems relatively common issue, seems relatively simple answer: git config --global core.mergeoptions --no-edit.

unfortunately doesn't seem work me or @ least 8 of other 15 people in class, , our instructor bit baffled (though fair hasn't had time beyond quick google search or two). isn't that big of issue, can escape out enough :q, we'd know answer to, , google searches return stack overflow questions --no-edit solution (either via core or every time pull done).

my .gitconfig (minus personal info):

[mergetool "kdiff3"]         path = "/c/program files/kdiff3/kdiff3.exe" [merge]         tool = kdiff3 [core]         mergeoptions = --no-edit [mergetool]         keepbackup = false

and yet:

image.

does know why fix isn't working (ie: "ya dun goofed in spelling 'options'"), or if there better/more reliable way fix this?

you need add add export git_merge_autoedit=no in .bash_profile , open new bash.

you can next bash command:

echo 'export git_merge_autoedit=no' >> $home/.bash_profile && . $home/.bash_profile

i hope helps :d


Comments

Post a Comment

Popular posts from this blog

ios - Memory not freeing up after popping viewcontroller using ARC -

-
hi project arc based, using uinavigationcontroller make transition between viewcontroller. using profiler analyse happening behind scene memory. noticed when push viewcontroller allocate memory components , when pop not freeing allocated memory. since using arc unable implement dealloc or release component. have analysed in detail , there no memory leak in project. i not using strong property push viewcontroller. here how pushing viewcontroller. viewcontroller *obj = [[viewcontroller alloc] init]; [self.navigationcontroller pushviewcontroller:obj animated:no]; any clue whats going on? should free memory have consumed. please advise your description indicates have retain cycle, leads objects not being deallocated. typical source of retain cycles properties assigned loading nib files (usually declared iboutlet ). two strategies break them , release objects: declare property weak : @property (nonatomic, weak) iboutlet uilabel *statuslabel; set property nil in...
Read more

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