GIT: Updating a feature branch with changes in master without merge -


i'm working on relatively large git repository, think follows reasonably standard setup follows: features developed in new branches, , merged master.

~6 months ago, feature partially implemented on new branch. turned out feature depended on bunch of other stuff, , put on burner until other stuff completed. leaves branch in question 18 commits ahead of master, , 93 commits behind, , has mix of contributors, don't want squash or loose history.

how current changes master onto feature branch please?

only thing can think of @ moment merging master , re-branching, there must better method of doing this, feature incomplete....

you have 2 options:

  1. merge master feature:

    $ git checkout feature $ git merge master

    this has disadvantage have resolve conflicts @ 1 time.

  2. rebase feature onto master:

    $ git checkout feature $ git rebase master

    if there conflicts, can resolve them manually each commit in feature's history. once conflicts resolved , added index, do

    $ git rebase --continue

Comments

Post a Comment

Popular posts from this blog

aws api gateway - SerializationException in posting new Records via Dynamodb Proxy Service in API -

i getting "__type": "com.amazon.coral.service#serializationexception" as reply in postman & in test console in api gateway trying post record directly dynamodb using api proxy services.. referring aws article - https://aws.amazon.com/blogs/compute/using-amazon-api-gateway-as-a-proxy-for-dynamodb/ here's mapping { "tablename": "tablenamegoeshere", "item": { "id" : "$context.requestid" "eventname" : "$input.path('$.eventname')", "timestamp" : $input.path('$.timestamp'), "answers": "$util.parsejson($input.path('$.answers'))" } } update: did asked ... , worked if try add array of json objects gives me above same error - here's trying now. please - couldnt find on google well #set($inputroot = $input.path('$')) { "tablename": "answer", "item": {
Read more

asp.net - Problems sending emails from forum -

i have been redesigning site has message board, has been written guy looked after site. it has few problems , written in .asp , uses .mdb files database. you can see whole thing here . feel free post if helps, test thing have set using original files , new database. the basic problem when posts message, supposed email sent them, have posted it. when replies, originator supposed message, replier has been posted. i’d have thought @ point in process there should script/file in postmessage.asp? the postmessage.asp page below. <% option explicit %> <!-- #include virtual="common/adovbs.inc" --> <html> <head> <meta http-equiv="content-type" content="text/html; charset=windows-1252"> <meta name="generator" content="microsoft frontpage 4.0"> <meta name="progid" content="frontpage.editor.document"> <title>new page 2</title> <base target="_self"
Read more