java - Undo bad merge already pushed to origin -


here situation :

i have develop branche , feature branche, when finishing feature want merge develop. conflicts arise so, first pull develop feature resolve commit modifications :

i commit file conflict resolved , forget rest. when merge feature develop rollback lots of commits...

origin develop>  ----o-c-c-c-o-------m------                       \       \     /  local feature>        f-------m-r-o

the commits 'c' merge feature when merging again develop forgot them.

how can solve ?

edit :

i'm not experimented git i'm asking have answer more specific problem everage git reset response

you have made bad merge.

origin develop>  ----o1-c1-c2-c3-o2---------m2------                       \           \        /  local feature>        f1----------m1-r1-o3

you mistake in commit m1 , changes propagated further down chain.

rewriting history

the cleanest solution problem rewriting history is still flowing correctly. however, breaks history every, need reset branch new head, recommended if seen mistake before pushed.

the fix redoing merge, redoing final merge master.

  1. on branch: feature: git reset --hard f1

    we going state of branch @ commit f1

  2. on branch: feature: git merge o2

    redo our merge, making sure aren't discarding our index time

  3. on branch: feature: git cherry-pick r1

    include changes introduced in commit r1

  4. on branch: feature: git cherry-pick o3

    include changes introduced in commit o3

  5. on branch: feature: git push -f

    force push our fixed feature branch

  6. on branch: feature: git checkout develop

    switch develop, can fix it

  7. on branch: develop: git reset --hard o2

    we going state of branch @ commit o2

  8. on branch: develop: git merge feature

    redo feature master branch merge, fixes whole chain.

  9. on branch: develop: git push -f

    force push our fixed develop branch.


Comments

Post a Comment

Popular posts from this blog

javascript - jQuery: Add class depending on URL in the best way -

i have html progress meter: <div class="col-md-3" style="margin-left: -20px;"> <div class="progress-pos active" id="progess-1"> <div class="progress-pos-inner"> login </div> </div> </div> <div class="col-md-3 progress-pos-container"> <div class="progress-pos" id="progess-2"> <div class="progress-pos-inner"> scan items </div> </div> </div> <div class="col-md-3 progress-pos-container"> <div class="progress-pos" id="progess-3"> <div class="progress-pos-inner"> confirm address </div> </div> </div> <div class="col-md-3 progress-pos-container"> <div class="progress-pos" id="progess-4"> <div class="progress-pos-in...
Read more

caching - How to check if a url path exists in the service worker cache -

i need check if particular url path exists in service worker cache. example, suppose url is: /myserviceworker/service?a=110&b=70 this url exists in cache, there many of them different values of , b. now, suppose want refresh of these urls, how can that? i want know how access key values service worker cache. if know key, plan follows: var url = new url(key); if(url.pathname === "\/myserviceworker/service") refetch key but not sure how cache key , in format is. mean, string or url? cache api has match() method returns promise resolving in response object if match or undefined if no match exists. second parameter object can specify ignoresearch not take account url parameters. the ignoresearch option supported firefox ( chrome status here ). in other hand, retrieve cache entries, can use keys() method.
Read more

Redirect to a HTTPS version using .htaccess -

i need modify .htaccess file redirect urls https version without "www". http://example.com --> https://example.com http://www.example.com --> https://example.com https://www.example.com --> https://example.com this how .htaccess file looks like: rewriteengine on rewritecond %{request_filename} !-d rewritecond %{request_filename} !-f rewriterule ^(.*)$ redirect.php?id=$1&page=$2 [qsa,l] what modifications need make .htaccess in order forward https without "www"? it depends on doing current code. looks file called redirect trying display php page seo friendly url. think might confusing people. anyway, need , force https without www, need 1 more rule above. also second rule needs two capture groups in rewriterule test string because wanting 2 different values using $1 , $2 references. rewriteengine on #rediect www non www and/or http https --- combinations. rewritecond %{http_host} !^example\.com [nc,or] rewritecond %{https} !^...
Read more