Moderator: Heart
Kurt wrote:Would someone PLEASE tell US now how to really work with GIT???
As I understood yet I have to PULL the master if I didn't do any changes on my local repository yet to get the actual master form git.
I think...
I have to push to my clone after I made changes on any files of my local repository to my clone.
If I want think my wanted changes on the files are done I select to push to my own clone and then commit to my clone on git to write what I have changed.
I would be happy if I understood it and what I wrote is correct.
And then???
How do I get my changes to the master???
Kurt wrote:I really would like to know which one of the developers and translators is used to work with linux.
Code: Select all
git configuration set checkme true
timoline wrote:Here a small description (TortoiseGit)
When you start coding, first
-Pull master to your local clone
-Change some code(fix bugs)
-Commit your changes (give a description and select the files you want to commit)
-Push to your gitorious clone
-On the gitorious website, Request merge to master
Code: Select all
git pull \
> git://gitorious.org/joomleague/joomleague.git \
> refs/merge-requests/70
remote: Counting objects: 69, done.
remote: Compressing objects: 100% (24/24), done.
remote: Total 25 (delta 15), reused 0 (delta 0)
Unpacking objects: 100% (25/25), done.
From git://gitorious.org/joomleague/joomleague
* branch refs/merge-requests/70 -> FETCH_HEAD
Auto-merging com_joomleague/components/com_joomleague/models/ranking.php
Auto-merging com_joomleague/components/com_joomleague/views/ranking/tmpl/default_rankingnav.php
[b]CONFLICT (content): Merge conflict in com_joomleague/components/com_joomleague/views/ranking/tmpl/default_rankingnav.php[/b]
Auto-merging com_joomleague/components/com_joomleague/views/ranking/view.html.php
[b]CONFLICT (content): Merge conflict in com_joomleague/components/com_joomleague/views/ranking/view.html.php[/b]
Automatic merge failed; fix conflicts and then commit the result.
Code: Select all
<<<<<<< HEAD:com_joomleague/components/com_joomleague/views/ranking/view.html.php
$frommatchday[] = JHTML :: _('select.option', '0', JText :: _('Select from Matchday'));
$frommatchday = array_merge($frommatchday, $rounds);
$lists['frommatchday'] = $frommatchday;
$tomatchday[] = JHTML :: _('select.option', '0', JText :: _('Select to Matchday'));
$tomatchday = array_merge($tomatchday, $rounds);
$lists['tomatchday'] = $tomatchday;
$opp_arr = array ();
$opp_arr[] = JHTML :: _('select.option', "0", "full ranking");
$opp_arr[] = JHTML :: _('select.option', "1", "home ranking");
$opp_arr[] = JHTML :: _('select.option', "2", "away ranking");
$lists['type'] = $opp_arr;
$this->assignRef('lists', $lists);
if (!isset ($config['colors'])) {
$config['colors'] = "";
}
$this->assignRef('colors', $model->getColors($config['colors']));
$this->assignRef('result', $model->getTeamInfo());
// $this->assignRef( 'pageNav', $model->pagenav( "ranking", count( $rounds ), $sr->to ) );
// $this->assignRef( 'pageNav2', $model->pagenav2( "ranking", count( $rounds ), $sr->to ) );
=======
//From
$frommatchday[] = JHTML::_( 'select.option', '0', '- ' . JText::_( 'Select from Matchday' ) . ' -' );
$frommatchday = array_merge( $frommatchday, $rounds );
$lists['frommatchday'] = $frommatchday;
//To
$tomatchday[] = JHTML::_( 'select.option', '0', '- ' . JText::_( 'Select to Matchday' ) . ' -' );
$tomatchday = array_merge( $tomatchday, $rounds );
$lists['tomatchday'] = $tomatchday;
//Type
$opp_arr = array();
$opp_arr[] = JHTML::_('select.option', "0", "full ranking");
$opp_arr[] = JHTML::_('select.option', "1", "home ranking");
$opp_arr[] = JHTML::_('select.option', "2", "away ranking");
$lists['type'] = $opp_arr;
$this->assignRef( 'lists', $lists );
if ( !isset( $config['colors'] ) ) { $config['colors'] = ""; }
$this->assignRef( 'colors', $model->getColors( $config['colors'] ) );
$this->assignRef( 'result', $model->getTeamInfo() );
>>>>>>> f9eafdd73d8a306f73f2bc8b717aadfa4bcbaf61:com_joomleague/components/com_joomleague/views/ranking/view.html.php
Code: Select all
//From
$frommatchday[] = JHTML :: _('select.option', '0', JText :: _('Select from Matchday'), 'id', 'name');
$frommatchday = array_merge($frommatchday, $rounds);
$lists['frommatchday'] = $frommatchday;
//To
$tomatchday[] = JHTML :: _('select.option', '0', JText :: _('Select to Matchday'), 'id', 'name');
$tomatchday = array_merge( $tomatchday, $rounds );
$lists['tomatchday'] = $tomatchday;
//Type
$opp_arr = array();
$opp_arr[] = JHTML::_('select.option', "0", "full ranking");
$opp_arr[] = JHTML::_('select.option', "1", "home ranking");
$opp_arr[] = JHTML::_('select.option', "2", "away ranking");
$lists['type'] = $opp_arr;
if ( !isset( $config['colors'] ) ) {
$config['colors'] = "";
}
$this->assignRef('lists', $lists );
$this->assignRef('colors', $model->getColors($config['colors']));
$this->assignRef('result', $model->getTeamInfo());
Code: Select all
<<<<<<< HEAD:com_joomleague/components/com_joomleague/views/ranking/tmpl/default_rankingnav.php
echo "<td>".JHTML::_('select.genericlist', $this->lists['frommatchday'], 'from' , 'class="inputbox" size="1"', 'value' ,'text' , $this->from )."</td>";
echo "<td>".JHTML::_('select.genericlist', $this->lists['tomatchday'], 'to' , 'class="inputbox" size="1"', 'value', 'text', $this->to )."</td>";
=======
echo "<td>".JText::_( 'From' )."</td>";
echo "<td>".JHTML::_('select.genericlist', $this->lists['frommatchday'], 'from' , 'class="inputbox" size="1"', 'id', 'name', $this->from )."</td>";
echo "<td>".JText::_( 'To' )."</td>";
echo "<td>".JHTML::_('select.genericlist', $this->lists['tomatchday'], 'to' , 'class="inputbox" size="1"', 'id', 'name', $this->to )."</td>";
>>>>>>> f9eafdd73d8a306f73f2bc8b717aadfa4bcbaf61:com_joomleague/components/com_joomleague/views/ranking/tmpl/default_rankingnav.php
Code: Select all
echo "<td>".JText::_( 'From' )."</td>";
echo "<td>".JHTML::_('select.genericlist', $this->lists['frommatchday'], 'from' , 'class="inputbox" size="1"', 'id', 'name', $this->from )."</td>";
echo "<td>".JText::_( 'To' )."</td>";
echo "<td>".JHTML::_('select.genericlist', $this->lists['tomatchday'], 'to' , 'class="inputbox" size="1"', 'id', 'name', $this->to )."</td>";
Code: Select all
$frommatchday[] = JHTML :: _('select.option', '0', JText :: _('Select from Matchday'));
Code: Select all
$frommatchday[] = JHTML :: _('select.option', '0', JText :: _('Select from Matchday'), 'id', 'name');
diddipoeler wrote:hallo,
this can not work. you see it on my testside: http://fussballineuropaneu.grammatikas- ... Itemid=471
look at the file: ranking.php in the helper directory. the array $roundlist is empty.
please look ever for all the files of a view, then change the select option statements.
greats diddipoeler
Code: Select all
function getRound($project_id, $roundcode)
{
...
}
Code: Select all
$thisround = getRound($project_id, $roundcode)
Users browsing this forum: No registered users and 3 guests