How to allow the client to switch git branches on a website? (*without technical knowledge, for QA)

0 votes

I need to find a way for our client(s) to switch branches on a project (website) without technical knowledge.
We push our features/fixes to separate branches, but when we need to get the client's approval - we have to merge them to a main development branch & pull to a UAT (test) server. When it's all approved we merge the development branch to the production branch & pull to the production servers.
The problem is when we merge more then one branch, 4 for example, and the client only accepts 2 of them. In that case we have 2 options: 

  1. Fix the other 2 or wait until they are accepted.
  2. Play with git to undo the merge & merge again only the approved branches.

I'm not happy with both of the options.

Is there any simple way to allow the client to just switch the branches on the UAT (test) server so we only merge after approval?

*By "client" I mean - Someone who has no technical knowledge at all, who doesn't know what linux/ssh/git/... is.

Can anyone help me with this ?

Thanks.

Jun 17, 2018 in Git & GitHub by Atul
• 10,240 points
81 views

1 answer to this question.

0 votes

I think ,except the two options you thought, there is another way:

  • Create a branch temp from development (same usage as development) for client use.
  • Merge the branches you worked into temp.
  • After client approved part of branches, then you can merge these approved branches into development and then merge development into production.
I hope the above information would be helpful for you.
answered Jun 17, 2018 by shubham
• 6,890 points

Related Questions In Git & GitHub

0 votes
2 answers

How to view the nested workflow of a local git repository?

The closest way to view branches in ...READ MORE

answered Aug 2 in Git & GitHub by Sirajul
• 40,990 points
96 views
0 votes
1 answer

How to solve the ‘Git commit -a error’?

This happens when no editor is set. ...READ MORE

answered Jul 5, 2018 in Git & GitHub by Tyrion anex
• 8,310 points
80 views
0 votes
1 answer

How to forcefully commit a file to Git even if the file is ruled as unchanged?

This is simple, just follow the below ...READ MORE

answered Jul 11, 2018 in Git & GitHub by Sophie may
• 9,870 points
57 views
0 votes
1 answer

How to locate Git installation folder on a Mac OS X?

By default the git homepage installs into ...READ MORE

answered Aug 6, 2018 in Git & GitHub by Sophie may
• 9,870 points
2,511 views
+13 votes
2 answers

Git management technique when there are multiple customers and need multiple customization?

Consider this - In 'extended' Git-Flow, (Git-Multi-Flow, ...READ MORE

answered Mar 26, 2018 in DevOps & Agile by DragonLord999
• 8,380 points
254 views
0 votes
1 answer
0 votes
1 answer
0 votes
1 answer

Trying to analyse Sonarqube from Drone.io in Github PRs

Just try the below steps.The DRONE_PULL_REQUEST environment variable has ...READ MORE

answered Jun 27, 2018 in Git & GitHub by shubham
• 6,890 points
225 views