git - Gitflow - master and develop diverged -

-

The model of the implemented git branches is shown below

But my branch Step 1: Merge for release in Master (no faster than forward)

Step 2: Merge release in development (no faster than forward)

After merging with step 1, it will not be available for step 2, the development and master gets separated.

How to develop and master the separation git-flow model naturally develops

and master deviation There is no way to follow that workflow and make sure that develops and One of the master is always the ancestor of the other.

If you have a look at Master and in the development you should only see the merge committ: 

  git log develop..master

This means that if you use the following git-log command, then the output should be empty: 

  git log - If you are not satisfied with this answer, please explain why it counts for you, to explain your question,  develop  and  Master  should not be different from each other.

Comments

Post a Comment

Popular posts from this blog

jsp - No mapping found for HTTP request with URI with annotation config Spring MVC and Jetty -

-
Image
I'm only using annotation configuration, the server starts, but when I use some pages error is displayed: Warning: no mapping found for HTTP request with URI [/WEB-INF/view/main.jsp] name 'org.springframework.web.servlet.DispatcherServlet -D7259e with DispatcherServlet in Controller mapping works fine, but no JSP page is full. I am using Jetty 9.2.0.M0 and Spring MVC 4.0.4 release. JetTyP Config: Private Static Last String CONTEXT_PATH = "/"; Private Static Last String MAPPING_URL = "/ *"; Private Zero Server (Int port) throws exceptions {server server = new server (port); Server.addLifeCycleListener (New LifeCycleListener ()); Server.setHandler (getServletContextHandler (getContext ())); Server.start (); Server.join (); } Private static ServletContextHandler getServletContextHandler (WebApplicationContext context) throws IOException {LOGGER.info ( "ServletContextHandler is ready"); CircleContaxHandler themeHandler = new circactont...
Read more

c# - Roxy file manager in MVC doesn't accept session path -

-
Hi friends I've downloaded a file manager for my MVC project. So I added to my project and everything works fine but everyone can use this product I mean everyone can type urls and upload files to my host !!!! This filemanager has a Jason config file, as you can see here: {"FILES_ROOT": "Fileman / Upload "," "File_type_kenny": "file", "THUMBS_VIEW_WIDTH": "140", "THUMBS_VIEW_HEIGHT": "120", "PREVIEW_THUMB_WIDTH": "300", "PREVIEW_THUMB_HEIGHT": "200", "MAX_IMAGE_WIDTH": "0" "ASP_net / Main.Shex? A = Created", " Dealederer ":" ASP_net / MAN.assx "ADELEDED IR "," MOVEDIR ":" ASP_net / Main.Shex? A = MoVEDIR "," Copdier ":" ASP_net / Main.Shex? A = Copdier "," Richie Dar ":" ASP_net / Main ASP_net / main.hex? A = Upload "," Downlo...
Read more

java - Ajax call to jsp and jsp redirecting to further jsp -

-
I am getting an Ajax call on a jsp page which in turn is redirecting based on the value of a flag variable JSP file. The AJAX call is something like this: $ Ajax ({url: 'uploadwebcamimage.jsp', type: "post", data: {encodeimg: dataUrl, OwnerId: document.Clickpictures.OwnerId.value, OwnerPhone: document.Clickpictures.OwnerPhone.value, mobilepass: document.Clickpictures. Mobilepass.value, emailpass: document.Clickpictures.emailpass.value, mypassword: document.Clickpictures.mypassword.value, mygroupuserid: document.Clickpictures.mygroupuserid.value}, error: work () {warning ('error');} success : Function (msg) {// warning ((msg)); if (msg) indexOf ("true")> = 0) {// how grouplist location.href = "site_index_groupadmin.jsp res1 =?" + to get the grouplist;} else {warning ("unsuccessful");}}}); And in jsp I have done something like this: & lt;% ArrayList & lt; String & gt; List = New Arrestist & lt; Stri...
Read more