• 0
Votes
name

A PHP Error was encountered

Severity: Notice

Message: Undefined index: userid

Filename: views/question.php

Line Number: 191

Backtrace:

File: /var/www/html/cnasolution/application/views/question.php
Line: 191
Function: _error_handler

File: /var/www/html/cnasolution/application/controllers/Questions.php
Line: 419
Function: view

File: /var/www/html/cnasolution/index.php
Line: 315
Function: require_once

I was working on a new feature on my local branch, I made some commits and then I create the merge request. It has been validated and merged into master, other merge requests have been pushed after that.

The issue is that we have multiple commits visible in the master branch with WIP and wrong ticket reference. I want to squash these commits in one and set the commit message.

We have the following commits on master:

EDIT

 git log --graph --oneline master * 63bcd68ce (HEAD -> master) [maven-release-plugin] prepare for next development iteration * 625d40a55 (tag: pta-root-3.6.1) [maven-release-plugin] prepare release pta-root-3.6.1 * 16b304566 (pta_temp) PTAP-XXXX - WIP Authentication anonymous updates * d5bf94fdc PTAP-XXXX - checkstyle issues * 76f5107bc PTAP-XXXX - WIP Authentication anonymous * ef7c71eb5 PTAP-XXXX - WIP Authentication anonymous * 21d9271d8 PTAP-XXXX - WIP Authentication anonymous * aa0af50da PTAP-XXXX - WIP Authentication anonymous-2 * e0b964795 PTAP-XXXX - WIP Authentication anonymous * 96984a70c PTAP-XXXX - WIP Authentication part 2 * 7832f7911 PTAP-XXXX - WIP Authentication * 040db7d97 [maven-release-plugin] prepare for next development iteration 

Is there any way to make it like this:

* 63bcd68ce (HEAD -> master) [maven-release-plugin] prepare for next development iteration * 625d40a55 (tag: pta-root-3.6.1) [maven-release-plugin] prepare release pta-root-3.6.1 * xxxxxxx PTAP-330- Add anonymous authentication  * 040db7d97 [maven-release-plugin] prepare for next development iteration 
Download script demo [LINK]
Download script demo [LINK 2] Download script demo [LINK 2]
git